Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[21.05] fix toRustTarget for windows #139697

Merged
merged 1 commit into from
Sep 28, 2021
Merged

[21.05] fix toRustTarget for windows #139697

merged 1 commit into from
Sep 28, 2021

Conversation

oxalica
Copy link
Contributor

@oxalica oxalica commented Sep 28, 2021

Backport of #134946

Motivation for this change

This breaks mingw target for rust when cross-compiling, and affect downstream usage.
Related: oxalica/rust-overlay#52

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@dermetfan @oxalica
rust.toRustTarget: fix for windows
c9049f7 
change vendor from "w64" to "pc"
broken since 9171853

(cherry picked from commit d89c29d)
@oxalica oxalica mentioned this pull request Sep 28, 2021
Closed
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Sep 28, 2021
@Mic92 Mic92 merged commit 96bf839 into NixOS:release-21.05 Sep 28, 2021
@oxalica oxalica deleted the bp/fix/to-rust-target branch September 28, 2021 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 Awaiting requested review from LnL7

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

@zowoq zowoq Awaiting requested review from zowoq zowoq is a code owner

Assignees
No one assigned
Labels
6.topic: rust 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@oxalica @Mic92 @dermetfan